Merge pull request #4 from math1man/dev

Dev