Merge pull request #400 from gogolander/test

code reformatted
push