Develop

A few fixes applied. Consider creating a develop fork rather than accepting this pull request into master maybe?

(Sorry, my editor auto removes white space. I held off on converting from spaces to tabs =P )