Merge pull request #1 from hacst/master

Changed stuff
Another change