Feature/misc 20140626