Merge pull request #1 from lefthandedgoat/master

Added some functionality
added a few more things