Merge pull request #12 from wagh/devel

Devel
Coding Style