Commit 0e9ea5d0e30f3c4a06b1823c189fbc8c070eae7a

nulltoken 2012-11-17T18:42:40

Merge pull request #1077 from nulltoken/fix/api Itsy bitsy tiny winy minor api related fixes