Feature/20140312 pull request