changes for 2.1 upgrade
Merge pull request #6 from janimattiellonen/2.1

changes for 2.1 upgrade