CS fixes
Merge pull request #12 from marcosdsanchez/fixes

CS fixes