Fixed bundle path issue
Merge branch 'feature-20140402-bug-fixing' into 20140401-dev-stable