Merge pull request #141 from atgeirr/master

Fix warnings