Re-formatting code
Merge pull request #4 from id774/devel

Re-formatting code