staging for merge
staging for commit
staging for commit, again.
Merge pull request #80 from cblokker/master

merging