Merge pull request #2 from cmrivers/master

update
pesky 2013 again ;)
Merge pull request #131 from rikblok/master

pesky 2013 again ;)