Merge pull request #308 from stevenaz/master

Fix for bug 321 - Generate indentation
Fix for #(326) - Comments after assign statements incorrectly indented