Merge pull request #22 from atsidaev/lib-20141204
authorEtchedPixels <alan@etchedpixels.co.uk>
Wed, 3 Dec 2014 22:33:00 +0000 (22:33 +0000)
committerEtchedPixels <alan@etchedpixels.co.uk>
Wed, 3 Dec 2014 22:33:00 +0000 (22:33 +0000)
Library fixes


Trivial merge