Minor bug fixes, with same features as previous commit.
Merge pull request #2 from GallopLabs/develop

Does not output anything.