Added minor issues when using embedded viewcontrollers
iOS 6 Fixes\nFixes #4
Merge from upstream.