Added test stub.
Cleaned up a little bit in main file.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'