Merge pull request #12 from jmatthias/develop

RELEASE 0.1.2