Merge pull request #229 from dsnet/master Fixed minor white-space formatting and ordering of elements