Merge pull request #3 from StrawberryKiwis/master

Adding changes from master.