danheck Merge pull request #2 from danheck/dev