Merge pull request #36 from snakevil/master

Fixed the last issue #24 for milestone 0.1.0-beta1.