Merge pull request #1 from cmrivers/master

sync with cmrivers
fixed another 2013 that snuck in ;)
Merge pull request #107 from rikblok/master

fixed another 2013 that snuck in ;)