Merge pull request #8 from StrikeHawkeComm/master

Master