small changes before manual merge
making changes to rebase
Merge pull request #14 from farfromguam/cfdev

push for rebase