Merge pull request #5 from pat-mak/master

Basic function test with transformation.
refactoring
Merge remote-tracking branch 'upstream/master'