bug fixes
Merge pull request #1 from elixir2011/develop

testing pull request