Bug fixes and further standardization.
Merge pull request #17 from pravsripad/further_standardize

Bug fixes and further standardization.