Added #393.
Added #481.
dev build