Merge pull request #37 from eprogramming/master

@author tag removed, no need this anymore...