#29, #30 

Merged recent master branch, and resolved conflicts. 
Please ignore not-committed of #90 and close.