Merge with izbay's master branch