Merge pull request #12 from noobieteam/master

Kyle