Merge branch 'development' release v0.1.3

latest commit 2a63abad5c

samrocketman authored Feb 28, 2014