Merge pull request #87 from redline6561/dev