Merge pull request #17 from wagh/devel

Devel