Merge pull request #11 from Johnidel/master

pulling