Merge pull request #92 from mshamash/master

Bug fixes
Merge pull request #93 from mshamash/master

	Code improvements + bug fixes
Merge pull request #94 from mshamash/master

Bug fixes, cleanup, code optimization.
Merge pull request #95 from mshamash/master

Minor Changes + Fixes
Merge pull request #96 from mshamash/master

Code improvements  + cleanup
Fixed a bug which prevented the app from building.
Merge pull request #43 from stephandev/master

Fixed a bug which prevented the from building.