Merge pull request #134 from mshamash/master

Bug fix, minor changes, API error alert view.
Completed all non-normal procedures.
Merge pull request #22 from stephandev/master

Completed all non-normal procedures.