Merge pull request #2 from SpaceStallions/master

Compare dev and master, merge.