Code tentatively merged.
Merge pull request #1 from aberberick/master

Code tentatively merged.