Merge pull request #59 from mshamash/master

	UI changes + added support for multiple OFP's
Cleanup
Merge pull request #14 from stephandev/master

Cleanup