Testing changes
Merge pull request #1 from bpaduch/master

Testing changes