Merge pull request #2 from SpaceStallions/master

Compare dev and master, merge.
Merge pull request #3 from SpaceStallions/dev

Merge pull request #2 from SpaceStallions/master