Version: 0.6

Overall bug fixes and changes.
Merge pull request #5 from Script47/master

Version: 0.6