updates May 2014
resolving merge with new fork