Converted indendation to spaces, misc smaller fixes
Merging Magmoz-master with master
Merge branch 'Magmoz-master'
Switched from spaces to tabs
Syncing tabs with latest master
Merge pull request #11 from DeviaVir/master

Converted indendation to spaces, misc smaller fixes