More refactoring. Remove incorrect comment. Hopefully should work on mac.
Merge pull request #335 from arielf/master

Fix issue #334: More refactoring. Remove incorrect comment. Hopefully should work on mac...