Merge pull request #21 from stephandev/master

Avoiding merge conflicts.
Bug fix, minor changes, API error alert view.
Merge pull request #134 from mshamash/master

Bug fix, minor changes, API error alert view.