Merged with master code.

Signed-off-by: cauth0n <derek.reimanis@gmail.com>