Merge pull request #28 from jensopetersen/master

formatting changes as instructed by Liudmila