sam899 Merge pull request #14 from Alliants/develop …