Added preferred method and cleaned up.
Merge branches '2014.03.20.1707' and 'master'