Merge pull request #1 from spidey/master

Code clean up and fast-trigger mod
Fixed build break: virtual keyword on source file