Merge pull request #1 from mlund/master

merge
My first mods to faunus fork - Joao Henriques 20/08/2013
Merge pull request #2 from mlund/master

merge
New mods and comments according to Mikael's suggestions.
Correct indentation.
Let's hope this is the last commit due to the indentation...
Merge pull request #25 from jmhenriques/master

My changes to the code.