Merging developer to master

2013.09.28. - First pull request.