More fixes.
Merge pull request #6 from benalexau/master

More fixes.