Merge pull request #15 from dkgp/master

Master