Merge pull request #1 from sea-lions-2014/format

format and releases
Merge pull request #2 from sea-lions-2014/master

Merge pull request #1 from sea-lions-2014/format