Merge pull request #6 from mike96/master

ag