Merge pull request #15 from SirGladius/master