Merge pull request #1 from saltastro/master

update placeholder
Fixed bug in saltflat
Merge pull request #26 from crawfordsm/bugfix2

Bugfix2