Merge pull request #3 from StrawberryKiwis/master

Adding changes from master.
Merge pull request #6 from ComNerd/master

Merge pull request #3 from StrawberryKiwis/master