Fixing build for now.
Minor sync up.
Merge pull request #17 from Adron/master

Periods.
merging